Skip to content

🌱 Drop usage of v1beta1 conditions #12109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 21 commits into from
May 12, 2025
Merged

🌱 Drop usage of v1beta1 conditions #12109

merged 21 commits into from
May 12, 2025

Conversation

fabriziopandini
Copy link
Member

What this PR does / why we need it:

Do not review, work in progress, I'm using this PR mostly to check everything looks good in CI but most probably I will later re-submit in a few smaller PR

Which issue(s) this PR fixes:
Fixes #

/area conditions

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. area/conditions Issues or PRs related to conditions cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 17, 2025
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 17, 2025
@fabriziopandini
Copy link
Member Author

/test?

@k8s-ci-robot
Copy link
Contributor

@fabriziopandini: The following commands are available to trigger required jobs:

/test pull-cluster-api-build-main

/test pull-cluster-api-e2e-blocking-main

/test pull-cluster-api-e2e-conformance-ci-latest-main

/test pull-cluster-api-e2e-conformance-main

/test pull-cluster-api-e2e-latestk8s-main

/test pull-cluster-api-e2e-main

/test pull-cluster-api-e2e-mink8s-main

/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

/test pull-cluster-api-test-main

/test pull-cluster-api-test-mink8s-main

/test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

/test pull-cluster-api-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-apidiff-main

pull-cluster-api-build-main

pull-cluster-api-e2e-blocking-main

pull-cluster-api-test-main

pull-cluster-api-verify-main

In response to this:

/test?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 18, 2025
@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

2 similar comments
@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 22, 2025
@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-main

@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

@fabriziopandini fabriziopandini force-pushed the drop-usage-of-v1beta1-conditions branch from 8816570 to 5e3fd7f Compare April 25, 2025 17:27
@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

@fabriziopandini fabriziopandini force-pushed the drop-usage-of-v1beta1-conditions branch from 5e3fd7f to 754995b Compare April 25, 2025 18:21
@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

@sbueringer sbueringer mentioned this pull request May 7, 2025
Open
73 tasks
@fabriziopandini fabriziopandini mentioned this pull request May 8, 2025
Merged
@fabriziopandini fabriziopandini force-pushed the drop-usage-of-v1beta1-conditions branch from 754995b to e06c3bc Compare May 8, 2025 17:13
@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

@fabriziopandini fabriziopandini changed the title [WIP] 🌱 Drop usage of v1beta1 conditions 🌱 Drop usage of v1beta1 conditions May 8, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 8, 2025
@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-latestk8s-main

Looks like just a flake

sbueringer
sbueringer reviewed May 9, 2025
View reviewed changes
@sbueringer sbueringer added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label May 9, 2025
@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

@fabriziopandini fabriziopandini force-pushed the drop-usage-of-v1beta1-conditions branch from e75694c to 3e469fe Compare May 12, 2025 10:57
@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 12, 2025 •
edited
Loading

@fabriziopandini: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-apidiff-main 3e469fe link false /test pull-cluster-api-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@sbueringer
Copy link
Member

Thx! Very nice work!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 12, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: b721225c9cdd0328b0aa8c7ce06956cdc5310a37

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 12, 2025
@k8s-ci-robot k8s-ci-robot merged commit 6a747a3 into kubernetes-sigs:main May 12, 2025
22 of 23 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone May 12, 2025
tylerauerbeck pushed a commit to tylerauerbeck/cluster-api that referenced this pull request May 12, 2025
@fabriziopandini @tylerauerbeck
🌱 Drop usage of v1beta1 conditions (kubernetes-sigs#12109)
f7fb8b7 
* Accept usage of clusterv1.ResizedV1Beta1Condition (it is for v1beta1 conditions management only)

* Stop using clusterv1.ClusterClassVariablesReconciledV1Beta1Condition in controllers

* Stop using clusterv1.TopologyReconciledV1Beta1Condition in controllers

* Stop using clusterv1.MachineNodeHealthyV1Beta1Condition in controllers

# Conflicts:
#	internal/controllers/machine/machine_controller_test.go

* Stop using clusterv1.PreTerminateDeleteHookSucceededV1Beta1Condition in controllers

* Stop using clusterv1.DrainingSucceededV1Beta1Condition in controllers

* Stop using clusterv1.VolumeDetachSucceededV1Beta1Condition in controllers

* Stop using clusterv1.BootstrapReadyV1Beta1Condition in controllers

* Stop using clusterv1.ControlPlaneInitializedV1Beta1Condition in controllers

* Stop using clusterv1.InfrastructureReadyV1Beta1Condition in controllers

* Stop using clusterv1.ReadyV1Beta1Condition in controllers

* Stop using clusterv1.MachineOwnerRemediatedV1Beta1Condition and clusterv1.MachineHealthCheckSucceededV1Beta1Condition in controllers

* Stop using clusterv1.bootstrapv1.DataSecretAvailableV1Beta1Condition in controllers

* Stop using controlplanev1.KubeadmControlPlaneMachine*HealthyCondition in controllers

* Stop using controlplanev1.controlplanev1.AvailableV1Beta1Condition in controllers

* Stop using controlplanev1..EtcdClusterHealthyV1Beta1Condition and controlplanev1.ControlPlaneComponentsHealthyV1Beta1Condition in controllers

* Drop unnecessary TODO

* Small cleanups

* Fix tests

* Address comments

* More comments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@elmiko elmiko Awaiting requested review from elmiko

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

Assignees

@sbueringer sbueringer

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/conditions Issues or PRs related to conditions cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Milestone
v1.11
Development

Successfully merging this pull request may close these issues.
3 participants
@fabriziopandini @k8s-ci-robot @sbueringer